From ab0cd2be757b192ff622e3304797538e5fe977a2 Mon Sep 17 00:00:00 2001 From: "tsteven4@gmail.com" Date: Fri, 16 Aug 2013 17:13:15 +0000 Subject: [PATCH] don't use windows ddks that won't work, e.g. the one with the cross compiler on fedora 18. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4543 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/configure | 2 ++ gpsbabel/configure.in | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gpsbabel/configure b/gpsbabel/configure index 0e4ac9759..77a43587f 100755 --- a/gpsbabel/configure +++ b/gpsbabel/configure @@ -4565,7 +4565,9 @@ main () { HANDLE HidDeviceObject; HIDD_ATTRIBUTES Attributes; + PHIDP_PREPARSED_DATA HidPPD; HidD_GetAttributes(HidDeviceObject, &Attributes); + HidD_GetPreparsedData(HidDeviceObject, &HidPPD); ; return 0; } diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in index 6b712acb0..352014fb0 100644 --- a/gpsbabel/configure.in +++ b/gpsbabel/configure.in @@ -183,7 +183,9 @@ case "$target" in [#include ], [HANDLE HidDeviceObject; HIDD_ATTRIBUTES Attributes; - HidD_GetAttributes(HidDeviceObject, &Attributes);], + PHIDP_PREPARSED_DATA HidPPD; + HidD_GetAttributes(HidDeviceObject, &Attributes); + HidD_GetPreparsedData(HidDeviceObject, &HidPPD);], [AC_MSG_RESULT(yes)] [AC_DEFINE(HAVE_WDK, 1, [Defined if you have Windows DDK])] [USB_LIBS=${USB_LIBS}" -lhid"], @@ -253,7 +255,7 @@ dnl Linux HID support case "$target" in *-linux-*) AC_MSG_CHECKING(for Linux HID interface) - AC_COMPILE_IFELSE([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include #include #include @@ -267,7 +269,7 @@ case "$target" in ioctl(0, HIDIOCGFIELDINFO, &finfo); ioctl(0, HIDIOCSUSAGES, &urefm); ioctl(0, HIDIOCSREPORT, &rinfo); - }], + }])], AC_MSG_RESULT(yes) AC_DEFINE(HAVE_LINUX_HID, 1, [Defined if you have Linux HID]), AC_MSG_RESULT(no)) -- 2.30.2